From 534df3bba622b5698d4339a219854ef52bb91c48 Mon Sep 17 00:00:00 2001 From: "kaf24@scramble.cl.cam.ac.uk" Date: Tue, 11 Nov 2003 12:10:54 +0000 Subject: [PATCH] bitkeeper revision 1.593 (3fb0d1ceZM5ys4sxO5836gfzMM0V9Q) string.c: Always include a memcpy function in Xen, for weird gcc configs. --- xen/common/string.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/xen/common/string.c b/xen/common/string.c index 2ff4efc426..2a8bb66815 100644 --- a/xen/common/string.c +++ b/xen/common/string.c @@ -391,7 +391,6 @@ char * bcopy(const char * src, char * dest, int count) } #endif -#ifndef __HAVE_ARCH_MEMCPY /** * memcpy - Copy one area of memory to another * @dest: Where to copy to @@ -401,6 +400,7 @@ char * bcopy(const char * src, char * dest, int count) * You should not use this function to access IO space, use memcpy_toio() * or memcpy_fromio() instead. */ +#undef memcpy void * memcpy(void * dest,const void *src,size_t count) { char *tmp = (char *) dest, *s = (char *) src; @@ -410,7 +410,6 @@ void * memcpy(void * dest,const void *src,size_t count) return dest; } -#endif #ifndef __HAVE_ARCH_MEMMOVE /** -- 2.30.2